From 870e806e0d8b546e5893a14c260144b18bf833f0 Mon Sep 17 00:00:00 2001 From: Tim Deegan Date: Mon, 13 Aug 2007 16:47:11 +0100 Subject: [PATCH] [HVM] [TOOLS] Move device state save earlier in suspend path Signed-off-by: Zhai Edwin --- tools/python/xen/xend/XendCheckpoint.py | 3 +++ tools/python/xen/xend/XendDomainInfo.py | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/python/xen/xend/XendCheckpoint.py b/tools/python/xen/xend/XendCheckpoint.py index 47b4cfba13..f88d8a8788 100644 --- a/tools/python/xen/xend/XendCheckpoint.py +++ b/tools/python/xen/xend/XendCheckpoint.py @@ -98,6 +98,9 @@ def save(fd, dominfo, network, live, dst, checkpoint=False): log.info("Domain %d suspended.", dominfo.getDomid()) dominfo.migrateDevices(network, dst, DEV_MIGRATE_STEP3, domain_name) + if hvm: + dominfo.image.saveDeviceModel() + tochild.write("done\n") tochild.flush() log.debug('Written done') diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index b3542ff1b8..3ca3f506d0 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -1184,8 +1184,6 @@ class XendDomainInfo: self._clearRestart() if reason == 'suspend': - if self._stateGet() != DOM_STATE_SUSPENDED: - self.image.saveDeviceModel() self._stateSet(DOM_STATE_SUSPENDED) # Don't destroy the domain. XendCheckpoint will do # this once it has finished. However, stop watching -- 2.30.2